/*******************************************************************************
 * Copyright 2014 United States Government as represented by the
 * Administrator of the National Aeronautics and Space Administration.
 * All Rights Reserved.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *   http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 ******************************************************************************/
package gov.nasa.ensemble.common.merge;

/**
 * A general set of strategies for resolving conflicts when merging between local and remote data. Known uses are for FileSync
 * merging (gov.nasa.ensemble.filesync) and EMF model merging (gov.nasa.ensemble.core.model.common.compare).
 */
public enum ConflictResolutionStrategy {
	GIVE_UP, // no strategy; merges can fail
	LOCAL_WINS, // local changes take precedence (last write wins); merges can't fail
	REMOTE_WINS // remote changes override local changes (first write wins); merges can't fail
}
